Merge tag 'upstream/2016.12' into debian/master
authorSimon McVittie <smcv@debian.org>
Tue, 25 Oct 2016 21:29:03 +0000 (22:29 +0100)
committerSimon McVittie <smcv@debian.org>
Tue, 25 Oct 2016 21:29:03 +0000 (22:29 +0100)
Upstream version 2016.12


Trivial merge